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

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

Change-Id: Ia7745f634e8961a4496fcc4ecce78e72f2444d6c