[automerger skipped] Merge changes from topic "csis" am: ded20a06 -s ours...

[automerger skipped] Merge changes from topic "csis" am: ded20a06 -s ours am: 374879e3 -s ours am: 641dbd7d -s ours am: b662aac5 -s ours am: 97934e75 -s ours

am skip reason: Merged-In I5088ef034b10ddf413c5acb4b199295a437e6f7e with SHA-1 de4b6a25 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1749840

Change-Id: I1d6a804cb5b587972486be7ddc1ee671f1ef5c6a