Merge changes from topic "presubmit-am-647350e3bf134d7da0e8df1bfb2dc418" into sc-dev-plus-aosp am: 1dcc8f8ab2

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

Change-Id: I8a3d167b51c24d37d493cb39cdc314b42f88f9c2