[automerger skipped] Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE" am: 6a4cd551 -s ours am: f1116a36 -s ours am: 81a7bd8e -s ours am: f0d7acd1 -s ours am: 50909d29 -s ours

am skip reason: subject contains skip directive

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



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