Merge changes from topic "presubmit-am-9edbd92f37f247879be8e4d327e22cde" into sc-mainline-prod am: f9b54558cd

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

Change-Id: I7a7aeeb5bdcd1bdaeb737429684249deb3466d24