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

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

Change-Id: Ie7ffc154472b84e9605c6dc0bdc374dfc3e1966d