Merge changes from topic "connectivity-mainline-presubmit-defaults" am: 513180aae8 am: 824ea0743d

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

Change-Id: Icb417f8cfb152efe51981ba24c3e245ee1f300f8