Merge "AVRCP: Fix unexpected index out of bounds exception"
am: eaebb03146

Change-Id: I26b8b0305dd77c7f6fd3c251dfe2b59fa99e004e