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

Change-Id: I750cc781849106636105802836417d57bd17819a