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