[automerger skipped] Merge changes from topic "cherrypicker-L48400000954920366:N08700001270826034" into tm-dev am: d67018db2d -s ours am: 7098dee1d2 -s ours

am skip reason: Merged-In Ib1d180cc799dde94ada642ce752623b4b65f1e31 with SHA-1 9adba92109 is already in history

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

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