[automerger skipped] Merge "AudioService: fix audio mode not reset to MODE_NORMAL" into rvc-dev am: 9454e04c am: 226cd45d -s ours am: bec2c04b -s ours am: a0fb9903 -s ours

am skip reason: Change-Id Ifb8c66372a8e994edcea628cad7dc2a7ee4763a6 with SHA-1 7d5a0048 is in history

Change-Id: I9fb81169d114052c16c0e3f53a331517adb81399