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

[automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: cdbca722 -s ours am: 5baff624 -s ours am: 0ec0c809 -s ours am: 6d6f7701 -s ours am: 00bc3f78 -s ours

am skip reason: subject contains skip directive

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



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