[automerger skipped] Merge changes I60ac5864,If37b0519,Ia9a24377 into...

[automerger skipped] Merge changes I60ac5864,If37b0519,Ia9a24377 into tm-qpr-dev am: 25adcaa1 -s ours am: 1c87eefe -s ours

am skip reason: Merged-In I60ac5864d20cbfd2f139872b66294f5045045b4f with SHA-1 8248277a is already in history

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



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