Merge "Improve AVRCP quality and state handling (2/2)" into oc-dev am: 5c54a732 am: 60315cab am: 9cc57140 am: 341b0d90 Change-Id: I750cc781849106636105802836417d57bd17819a