[automerger skipped] Merge TQ2A.230305.008 am: 643ea080 -s ours am: 7363605d -s ours

am skip reason: Merged-In I86a5bb0b96332880a2a173ad57b96fb007e3ea83 with SHA-1 2506a98f is already in history

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



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