Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2861586



Change-Id: I7caba6a04178fda73e0ce94f784a6f890971481e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>