Merge changes from topic "conn_test_defaults_cp" am: de3c20ecb5

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

Change-Id: I0a14a5fc335b46a5fd61c126e3107898253d097f