[automerger skipped] Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 78b890f1 am: 00397588 -s ours am: 1df3d957 -s ours am: 1b7c77a8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6a97deda9e344fa6dcc1056649fb448a52cb119c