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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I181c235c4dc71b7089d0aeb2bb8a4d87b4554f13