Improve AVRCP quality and state handling (1/2) am: 6b95520b8f  -s ours
am: eb71d9027f

Change-Id: Ic96562faf1357ae42dff5d648b00d8ccda04cb33