Merge "AVRCP version interop pereference (3/3)" am: 48ce402668
am: 6e898e8ffd

Change-Id: Ib858c4a4da6515d6d79c54cbd9bdefea2fa09ce1