Merge cherrypicks of ['googleplex-android-review.googlesource.com/24225009'] into udc-release. am: bd692130a5

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

Change-Id: I18fb4e37521b9e8f63016246ad7edbf47a2da679
Signed-off-by: Automerger Merge Worker <[email protected]>