Merge changes from topic "connectivity-mainline-presubmit-defaults" am: 513180aae8 am: 20d5620537

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

Change-Id: I0f9f1db9e0d2a717f98dbf2ea2793122c57eb859