[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "qpr-dev_master_pandora_cherry_pick" into tm-mainline-prod am: 1609ef5a -s ours

am skip reason: Merged-In I5c95627b3f674495e0d9d022d2efff1da5ccefc5 with SHA-1 ae29ca0c is already in history

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



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