[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: 4ffa4392 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I075d157db6d1b59d4e84996ae069ac596a153c4c