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 am: 3a93258b am: a3cd1654 -s ours
am: ac4f36af
Change-Id: If156489df4e8f071068e226dbd11b2f4910041ae