Merge "Remove duplicate dump of A2dpStateMachine"