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