[automerger skipped] Merge changes from topic "cherrypick-Rename...

[automerger skipped] Merge changes from topic "cherrypick-Rename framework-connectivity-tiramisu-sc6n16uuh1" into tm-mainline-prod am: 43bf771f -s ours

am skip reason: Merged-In I44653ab7be117cf08cb3b8d3086ad76b43bf15e1 with SHA-1 e074dd2e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16961343

Change-Id: I53eb11184a873a7985d007e8a352ce01eec19e48