Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2787047 Change-Id: Id123d9242daa65f5e794e784fdbfeddf5b561482 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>