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