[automerger skipped] Merge changes from topic "avrcp-ct-cover-art-pts" into...

[automerger skipped] Merge changes from topic "avrcp-ct-cover-art-pts" into rvc-dev am: 2fbf3857 -s ours am: 7c2532ab -s ours

am skip reason: Change-Id I01c65ce0c60c4f81c408152f5f986e6818150dd1 with SHA-1 295be9c1 is in history

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

Change-Id: Ie39cf9c7a56be8db7693e6583b357d5357ced492