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

Change-Id: I4254dd298f9e0f77c777bcfa3456c6763da28b1d