Merge "AVRCP version interop pereference (2/3)" am: db66a7b664
am: da582fa40d

Change-Id: I79cb69494d6d3860494f4fa36f44095e1d2c6c6f