[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged."...

[automerger skipped] Merge "DO NOT MERGE -  Mark RQ2A.210105.001 as merged." am: 8f05c6fb -s ours am: 239b0f87 -s ours am: a4336a69 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I15620be966cb4b2d2a9bcb84b220b85ab9b05016