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