Merge "AVRCP version interop pereference (3/3)" am: 48ce402668 am: 6e898e8ffd
am: 5a9b36027d  -s ours

Change-Id: I1a5ba89189978466a12ba518bea9e3c78ac9bb92