Merge changes from topic "am-4bed95e59dd747a883d051bbbfa99fd5" into tm-d1-dev-plus-aosp am: fc9451e355 -s ours

am skip reason: Merged-In Ib8752439593dcd285146746b06b29f364e66ab85 with SHA-1 896472ff53 is already in history

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

Change-Id: Ia3699ebf33013e789f18e1903fd1b091065e3599
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>