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

Change-Id: I5f58277d5ab6f650d53a943261b361879558ee75