[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 5823af2f -s ours am: 6e120239 -s ours am: 6da629e8 -s ours am: 590f018a -s ours

am skip reason: Change-Id Iad97a12fd29cfe2d36a1642d22bca5f876e6f004 with SHA-1 1b8f3821 is in history

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

Change-Id: I7933a42832dd5c5d436bb8e1b5a600420e7d691f