Merge "Merge "Back up / restore the \'mono audio\' setting" into nyc-dev am:...
Merge "Merge "Back up / restore the \'mono audio\' setting" into nyc-dev am: a3aaa5ee am: d33151bf" into nyc-mr1-dev-plus-aosp
am: 97e9d8e9
* commit '97e9d8e9':
Put launch adjacent activity in a new task if the activity does exist
Change-Id: I8f00b7d34c6441aebe8d7d488b79c888d4c47e52