Merge "msm8998: Add custom config ids" into audio-userspace.lnx.2.2-dev