[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: I6a01c2a351d97af06698e2b07e6c8f811700cec7
This commit is contained in: