[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: 777e554d -s ours

am skip reason: Merged-In I046503a60f39aa1ec6026c139203b1a1d5a7dab5 with SHA-1 3dfbfee0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16961283

Change-Id: I2c832a1dde3da4bfb5179f3735224d0adcea3938