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

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

Change-Id: Id2cb24cb61df117b509b775cc9b15d7864fc1453