Merge "qcacmn: Have same rows orders for the channel enums and channel maps"