Merge "Ambient: If user turned off ambient, keep it off after split" into...

Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev am: db1fd054  -s ours am: 299b5741  -s ours am: 0d280c5a  -s ours
am: 65bee562  -s ours

Change-Id: I58d0facdffd4b7da61d564bab4f5f2c2a214401d