Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev am: db1fd054d2  -s ours am: 299b57410d  -s ours
am: 0d280c5a52  -s ours

Change-Id: I6198082bc0dce2cccb7818e08e027e1df493ae1b