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