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