[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 649903f2 -s...

[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 649903f2 -s ours am: 1bf781cf -s ours am: 1cecb076 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8357619320f916f4b72d97cd8257d896c085ea9