Merge "AVRCP version interop pereference (2/3)" am: db66a7b664 am: da582fa40d
am: 0ae97550ee  -s ours

Change-Id: Ibe4bc0f1bc067d2fb7560e2b03e09e1dea8c70ee