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

Change-Id: Ibd189c13b77c4ed6ebfc196bdf6f39653754fd44