Merge "AVRCP: Fix returned attributes for Genre/Play Time"