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