[automerger skipped] Merge "Address testAddressedPlayerChangedToSamePlayerId...

[automerger skipped] Merge "Address testAddressedPlayerChangedToSamePlayerId flake rate" into sc-dev am: ea7afae4 -s ours

am skip reason: Merged-In I51db5e7546519080fba89e7cab729b80c65d849d with SHA-1 f51b194b is already in history

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

Change-Id: I2fd1ac4567de937f3ee2fb7e3413a2e4cc257fe3