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