[automerger skipped] Merge changes from topic "update_Bluetooth_prebuilt" into...

[automerger skipped] Merge changes from topic "update_Bluetooth_prebuilt" into tm-qpr-dev am: 4234e822 am: 6c97d00d -s ours

am skip reason: Merged-In I79a0674e8a48a43d901337ec63a30089567e5cb7 with SHA-1 12c3ea47 is already in history

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



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