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

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

Change-Id: Id2d8375f10ddc2856a4e4aa0aefac18f6c1399ee