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