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

Change-Id: Ia811c6bb0841bfc9bce56f7bdb95e2bbc591ef34