[automerger skipped] Merge changes I00d1aa47,Icffbe67f into sc-dev am: c056232f0e -s ours am: ec4436317b -s ours
am skip reason: Merged-In I00d1aa475033810a5f60f0e3fc692be87ff62e13 with SHA-1 0dd6de5842 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14911203
Change-Id: I46c80569f0e0bfaf7c28d1793d98923b68ed8938
This commit is contained in: