Merge "A2dp: Track the current state machine state" into p-keystone-qcom