Merge "Add missing A2dpStateMachine lookup when processing native events"