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