Replace SIR_MAC_QOS_* with converged QOS macros. Change-Id: I669b83495b4f78398200135c41cd67867fb2fc3d CRs-Fixed: 2457795