[automerger skipped] Merge changes Ie8511b84,I940fa471,Ib9854348,I91d6febd...

[automerger skipped] Merge changes Ie8511b84,I940fa471,Ib9854348,I91d6febd into tm-dev am: 668954b3 -s ours

am skip reason: Merged-In Ie8511b84b2b21e3ed17a204a843d18944399d6e4 with SHA-1 0f409764 is already in history

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



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