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

Change-Id: I501deaba8e5ec202c9f24acfd52f4c608ab61bc0