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