Merge "Merge "Improve AVRCP quality and state handling (2/2)" into oc-dev am: 5c54a732 am: 60315cab am: 79b94a58" into oc-mr1-dev-plus-aosp