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