[automerger skipped] Merge changes I270ff43c,Ifc7eee24 into sc-dev am: 6cea6edc9c -s ours am: 285821741c -s ours
am skip reason: Merged-In I270ff43c01736b9d18bd40a8e88e1379e9e4e863 with SHA-1 76e2e1c702 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15044629
Change-Id: If882d6758479021a6704b00aa1f5d1ac5dffc47d
This commit is contained in: