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



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