Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested"...
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into nyc-dev am: b01ee142 am: 6c86c5fb
am: 7a8e9c13
Change-Id: Ibf437c7127c08d08b9edf02d719689f7a8ba54fb