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