[automerger skipped] Merge changes...

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

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

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



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