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

Change-Id: If7c3f02edafe61fdcc91220e73f01ee2cd309414