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

Change-Id: I623425d7c482fd47f71978eed46e4de825c86afd