Merge "Merge "Improve AVRCP quality and state handling (2/2)" into oc-dev am: 5c54a732f1 am: 60315cab7a am: 79b94a58a4" into oc-mr1-dev-plus-aosp
am: 7a488f8990

Change-Id: I211baa99d834d83ac49510038c3ed81885af7320