Merge "GAP: Handle illegal profile state exception" into p-keystone-qcom