Merge changes from topic "presubmit-am-647350e3bf134d7da0e8df1bfb2dc418" into sc-qpr1-dev am: 814a8e4d90 am: d5e28474f7

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

Change-Id: I540ccf12ff81f6b680b8f9ac8410d75945aaf842