Merge "AudioService: fix audio mode not reset to MODE_NORMAL" into rvc-dev am: 9454e04c am: 226cd45d Change-Id: Idaaff7433feeec2c75d9b848a826e3739c96b99e