[automerger skipped] Merge changes I109d599d,I407dc781,I28a371af,I45f67767,I23bb0ccf, ... into tm-d1-dev am: 9fed7229 am: 1759d032 -s ours am: 64532f74 -s ours

am skip reason: Merged-In I109d599ddac080fa2919ef586aa4510e4ab6fe8a with SHA-1 352ee339 is already in history

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



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