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

Change-Id: I951c387b9f3d2c2df5eccb6b3d5e50206b0db84e