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

am skip reason: Merged-In I36fdb2a67b9ae9dd67ec38b9e1fa8ffa02772e61 with SHA-1 4e21e80ae1 is already in history

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

Change-Id: Ib4158f319f9dac05a91641f188938ecd77b7c7dc
tree: 80222cd5854f41a154ac1f179a2fb74fa33792b0
  1. nearby/