Merge changes from topic "connectivity-cts-cherrypicks" into sc-dev am: 77fb999ed0

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

Change-Id: I197cb49c4f4515fd652ee1056120abf01088ed56