Merge "AudioService: fix audio mode not reset to MODE_NORMAL" am: 87685d3648 am: bcfd42d906

Change-Id: Ib4aacd394a0c1d137222b253e15fd85a781b0ebd