[automerger skipped] Merge "AudioService: handle errors when reconnecting mixes after server crash" am: 0ac7e561e9 am: 933083b88c am: d9b96d99a1
am: 54ca7f7696 -s ours
am skip reason: change_id I1dbfdac1873ed9c44c20ca9d25bbe01ce9904ee5 with SHA1 549ac37d31 is in history

Change-Id: I2fec9caa6392568c7fd92635f498ebe5aaa5b75a