Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes...
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into nyc-dev am: b2a48524 am: 990bd0a8 am: abc70842 am: c268ac67
am: d8990b93 -s ours
Change-Id: Ibf22da15b0bba4597acc38a64a202d632fdddfff