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

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

Change-Id: Ibaf4a6053dfdd30a133b408f5fd2382337894439