[automerger skipped] Merge changes...

[automerger skipped] Merge changes I8cd946e3,I9c124318,Ibcea4ddf,I276108e6,Ib18d07a6 into tm-qpr-dev am: 94d90894 -s ours am: 908be322 -s ours

am skip reason: Merged-In I8cd946e39de8e31dd17bdbb6d9fa1f1a2e57e40c with SHA-1 b43a2d3e is already in history

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



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