Merge changes from topic "avrcp-ct-cover-art-pts" am: 46b7d26f93

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

Change-Id: Ia09a6f8b4fdf0c0303e720dd9082d23513703d70