Merge cherrypicks of [16822123] into sc-v2-release. am: e6676b7017

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

Change-Id: I99be902059e6f7c4674e7d7ed5a1a5a2be6a542f