[automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: cdbca722 -s ours

am skip reason: Merged-In I4c0b2775d21f049fe36dafc6212640e13a18e380 with SHA-1 806ef0ec is already in history

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



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