[automerger skipped] Merge changes I00d1aa47,Icffbe67f into sc-dev am: c056232f0e -s ours

am skip reason: Merged-In I00d1aa475033810a5f60f0e3fc692be87ff62e13 with SHA-1 0891de6311 is already in history

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

Change-Id: Ieb480e55809f1b3a2b6787838744543db627d395