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

Change-Id: Ia49ab34142e5e26f886b07f2e17575e81c9dfd0d