Merge "AudioService: fix audio mode not reset to MODE_NORMAL" into rvc-dev am: 9454e04c8c

Change-Id: Id8223964f22ed298d657818b730eeda009f4592a