[automerger skipped] Merge changes...

[automerger skipped] Merge changes I75d66d97,I76a31582,I7811e361,I124ffe4c,Ia1f9b52d, ... am: 1c6ce73c am: c6a89d4f -s ours

am skip reason: Merged-In I75d66d970fe7e00aa6147c96267e2ddd9a369923 with SHA-1 b08e998b is already in history

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



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