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