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