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: I2bf058f711c366f937dac8f99af93196f0b413dc