Merge "Update the A2dpService logic for creating/deleting state machine instances"