[automerger skipped] Merge changes I49e5a99f,Ia3e4b336 into sc-dev am: 77fdd31db1 am: f9678d1008 -s ours
am skip reason: Merged-In I49e5a99f18a5651370e6914f30be659134b537ff with SHA-1 4dad9710e1 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15054374
Change-Id: Ie4228b266a3822aba482db27404b444a7a5d4e21
This commit is contained in: