[automerger skipped] Merge "Merge TQ2A.230405.003" am: 73c91fe1 am:...

[automerger skipped] Merge "Merge TQ2A.230405.003" am: 73c91fe1 am: 025a2210 -s ours am: 2a329d8c -s ours am: 3d7ff536 -s ours am: f4da420c -s ours

am skip reason: Merged-In I1be2cd3b5daa08e24ef44ace7901b3312d2f14ce with SHA-1 ec38e6d7 is already in history

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



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