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