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

Change-Id: If4255dfc955528f13f3f1752682a4d4c37d71205