[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L85400000956846144:N45900001302765211" into tm-qpr-dev am: 55733faa -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: Ie0cc2ef4d9f1f862ce2ea1f92e4880743aae0fdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>