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