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