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