Merge changes from topic "am-015983a8e68c40518b3338e5bafeb46a" into tm-d1-dev-plus-aosp am: a6bca29d92 -s ours

am skip reason: Merged-In I60d5540821abcced03356f366775f16ee369d7f9 with SHA-1 9cd4726890 is already in history

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

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