Merge changes I3fffbf4a,If557b0a1 into sc-dev am: bba6383a73

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

Change-Id: Iefc6f6ead2b61e2c36dea1c2a9077990b1d4980b