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

Change-Id: I4aa1a4878f5fcf170894d2427c7d320176145c08