Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2986117



Change-Id: Ibc37d6587d9df8ea365b339e729057aa908f58ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>