Merge "Volume handling during SHO and BT ON/OFF" into p-keystone-qcom