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