Merge "AVRCP: Provide more media attributes am: 0fcd081c am: 1da98c51"...
Merge "AVRCP: Provide more media attributes am: 0fcd081c am: 1da98c51" into nyc-mr1-dev-plus-aosp
am: b60af350
* commit 'b60af350':
Change-Id: I0c965a3c45a7bf42bda78e7072ed1d2c08451ea9