Merge changes I49e5a99f,Ia3e4b336 into sc-dev am: 77fdd31db1

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

Change-Id: I99ef58f523c1160e32911b56842202e0657f4015