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

Change-Id: Iffa7a60ec055dcb46035c6795b22fb30b96bd787