[automerger skipped] Merge changes from topic "bt-api-update" am: 0b3fcdf1 am: 5b479003 am: 71937f9e am: 2935fca0 -s ours

am skip reason: Merged-In If87e0863f23b989632603ac1253e4a77bfff028d with SHA-1 a89f2e1a is already in history

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

Change-Id: Ia4e3b771ab226d88d411df2f734e5303bee74295