[automerger skipped] Merge "Merge TQ2A.230305.008" into stage-aosp-master am:...

[automerger skipped] Merge "Merge TQ2A.230305.008" into stage-aosp-master am: 7e092a01 -s ours am: f7a6a05b -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: Id68c63bbed106e44030863f9b2010a8d549f911b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>