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

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

Change-Id: Id9ef943b4721442440ca7e62d72dc851253b1be2