Merge "Improve AVRCP quality and state handling (2/2)" into oc-dev am: 5c54a732f1
am: 60315cab7a

Change-Id: I88d00765cd8e9a3f8b31135f3b63f9a25012dac1