Back Merge :: To resolve merg conflict prjs-platform/hardware/qcom/audio

Change-Id: I9af84a86fcd0e6f9c78657be0deac61f48641bc4