[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: 8a4f98e3 -s ours

am skip reason: Change-Id Ieea6a708ca0fd1689e4b120db12f0cd96e8db95d with SHA-1 f4756830 is in history

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

Change-Id: I1c3a364f122adc44e769edd957cb160cf733a2b9