[automerger skipped] Merge "Merge Android 12 QPR3 ab/8391262" into...

[automerger skipped] Merge "Merge Android 12 QPR3 ab/8391262" into stage-aosp-master am: ef8c1aab -s ours am: a51ef6f2 -s ours

am skip reason: Merged-In I59d904735285af6ce9ca6c5ca00cb28e2a873699 with SHA-1 7a78e38e is already in history

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



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