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