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