Merge changes Ic33d8976,Ib5bd74d8 into sc-dev am: 6c1e049e29 am: 574e8d3573

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

Change-Id: I288e2ca40581dcaa5987e24558939bfd97fea955