Merge changes Ib8fe719f,Ia8c05780 into sc-dev am: 3ea9a136fa

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

Change-Id: I11b73ce42cae4df5314ad58e0a92b4cb834b8ff1