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