[automerger skipped] Merge changes from topic "cherrypicker-L19600000954488498:N18900001264327475" into tm-dev am: d1ba6a4f53 -s ours

am skip reason: Merged-In I8973d248a1d30fdcb597677dbf051e146041f905 with SHA-1 a023f88193 is already in history

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

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