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