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