Commit f616cec1 authored Jun 08, 2020 by Xin Li Committed by Automerger Merge Worker Jun 08, 2020

[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 6d06f871 -s ours

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

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

Change-Id: I5fcfeea5207bf8bcc34953ac140bff21a5f62ee3

There are no changes