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