[automerger skipped] Merge changes I3fffbf4a,If557b0a1 into sc-dev am: bba6383a73 -s ours

am skip reason: Merged-In I3fffbf4a5dea68e61349de8b41bea49b8a319f86 with SHA-1 70f43ee58e is already in history

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

Change-Id: Ib3ea6dd997f333c97c152badd368dfa119dceda2