[automerger skipped] Merge "Merge Android R" am: a70b6dcd -s ours am:...

[automerger skipped] Merge "Merge Android R" am: a70b6dcd -s ours am: b9425bf0 -s ours am: 412f89b7 -s ours

am skip reason: Change-Id I9d9a661e1106db1b531069a5038f957a009bd3c3 with SHA-1 6acbae22 is in history

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

Change-Id: I89ad5b515166873ac55119384ea5fe17bea7f789