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