[automerger skipped] Merge changes Ib8fe719f,Ia8c05780 into sc-dev am: 3ea9a136fa -s ours am: af9d24ce45 -s ours

am skip reason: Merged-In Ib8fe719f3c1c4a65e6b5152df5e5adf33aba2079 with SHA-1 21021efbe1 is already in history

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

Change-Id: I2d9d46373f34a9c1a18c35d4fbcbda9fba194587