[automerger skipped] Merge changes I77dc5556,If772078c,Idb19b0f7 into sc-dev am: e7ac3ffec5 am: e89ecee138 -s ours
am skip reason: Merged-In I77dc5556458c2e824f7abd5a7b79e8aeed8dabf3 with SHA-1 79f6827d45 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15079710
Change-Id: I9122aa1d0a6cf9dc4133c6c80931a092123125ef
This commit is contained in: