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