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

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

Change-Id: I39dafb6135002eb01e0e5baf6a8745f908a1b374