Merge "Cast enum to uint32_t before comparing with AUDIO_MODE_CNT" am: 5a6a5a9b82 am: 31d882eab0
am: b592a9ff39

Change-Id: I265d446fdea63c834b1216feb7ffe19d260b6c50