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

Change-Id: I545f4a8b8971fd10387bb28420c3940d67ef91ce