Merge "Merge "Promote incoming connection from unary to unordered set" am: 6a55ef23 am: faf1391c am: 87a353cd am: 8122c493 am: 08ec39dc" into tm-dev am: d9e5a8b3 am: be15c7d8

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



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