Merge cherrypicks of [16214695] into sc-qpr1-release. am: e3297e1ec0

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

Change-Id: I413173320e2dcc79791ff116fdda96ce1ec9068f