[automerger skipped] Merge "Merge TQ1A.221205.012" into stage-aosp-master am:...

[automerger skipped] Merge "Merge TQ1A.221205.012" into stage-aosp-master am: c0cb2e7d -s ours am: c2f45e10 -s ours

am skip reason: Merged-In I1330080abfd638fb36aad9535b6f5f5872986a7f with SHA-1 29a297b4 is already in history

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



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