Merge "Back up / restore the \'mono audio\' setting" into nyc-dev am: a3aaa5ee25
am: d33151bf4f

* commit 'd33151bf4fe0da6b64abb995deedaa6622560545':
  Back up / restore the 'mono audio' setting

Change-Id: I51abe2a24d8682792479102e555dd4bc3c1922b9