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