Merge changes from topic "presubmit-am-9edbd92f37f247879be8e4d327e22cde" into sc-qpr1-dev am: afef04e645

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

Change-Id: I91a6ee4e3cd2e94c47819fa2570e7ae55e56dc95