Merge "Merge "Back up / restore the \'mono audio\' setting" into nyc-dev am: a3aaa5ee25 am: d33151bf4f" into nyc-mr1-dev-plus-aosp
am: 5077e755f3
* commit '5077e755f3af857e584551f89708e608f1aa4427':
Change-Id: Iea23fedb441a5f874c12c7ad0fd55151363b14a8
This commit is contained in: