[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L85400000956846144:N45900001302765211" into tm-qpr-dev am: 55733faa -s ours am: 231609d1 -s ours

am skip reason: Merged-In I183995eaf1c3a20f1ffa0dab45eeb118983904f8 with SHA-1 a28ed9bf is already in history

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



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