[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am:...

[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 2f822862 -s ours am: 2507605a -s ours

am skip reason: Change-Id I975217edae4b9b4c07150a953e451fc5552e4101 with SHA-1 b0b210ac is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I765f31bef8f9056b3d9716b5ebc993e23a4b1f97