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