Merge changes from topic "am-d7f8ac1680b94a5ea53a7c2c8088560b" into sc-v2-dev-plus-aosp am: 86252b461a

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

Change-Id: Ie3c539126feaf5d58ecd4aeb178d07b8521bbe44