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