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

Change-Id: Iadd7477fec9bb08f206bbe40303a96439cdbbd4f