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