Merge "AudioService: handle errors when reconnecting mixes after server crash" am: 0ac7e561e9 am: 933083b88c
am: d9b96d99a1

Change-Id: Ifaaf16f32a7e9a4cc1136ee0c124f4a0914e6c4b