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