[automerger skipped] Merge changes from topic "cherrypicker-L34800000954905788:N57900001270872696" into tm-dev am: 52f0fe0c47 -s ours am: d355859da0 -s ours am: 7c51f64392 -s ours

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

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

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