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