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

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

Change-Id: Ia3919ae1e66f94ee8a3fe37853a49ad328577d7d