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