[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 skip reason: Change-Id Ibf87b4db0c49db9f489b2937bff9691258f71e16 with SHA-1 2cef12eb is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I386bc1385e22786b8e4c60248488d92e11462255