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

Change-Id: I62bacf450c64f98e44e15e0a1ec7a4f13f2982c4