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