Merge "Improve internal state synchronization of the A2dpStateMachine" into oc-dev
am: f4dd1916bf

Change-Id: I937d87a60f62ca3e8bea977c5ebf2d456898691c