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



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