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
am: 0298c694
Change-Id: I7f340e1a0cb5f707e313bfe448b994f9fa38f404