[automerger skipped] Merge changes Ic33306aa,I00f30dcc,Iea865346 into tm-qpr-dev am: 00f9385d -s ours am: 668983f0 -s ours

am skip reason: Merged-In Ic33306aa81d0c35332be9c73741fc2e7eaea0f51 with SHA-1 d78b174a is already in history

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



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