[automerger skipped] Merge changes I8672b5ff,I8e0e85b1 am: 96a7ffd2 am: 7b20aea2 am: dbfff871 -s ours

am skip reason: skipped by user cmanton

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

Change-Id: I5f3166d90e2590e0ff0837b79efed11374929884