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