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