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

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

Change-Id: I4d18e6b4d1d709a8a31df729339f6c910a6af257