Merge "Improve internal state synchronization of the A2dpStateMachine" am: 1de504036f
am: 2e5ab36e0d

Change-Id: Id0f1d9a679fdbb307c2173362a193ff67ed60956