[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "aosp_master_pandora_cherry_pick" into tm-qpr-dev am: 4b238696 -s ours am: 2ee78c84 -s ours

am skip reason: Merged-In I690e23c4eadd7a9e3f33eb246f4458d23eb03df0 with SHA-1 64be1dcc is already in history

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



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