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

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

Change-Id: Ie20918c1a8306342de7a5e2201d3e55fff39500c