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