Ambient: If user turned off ambient, keep it off after split
am: 21984eeaf7  -s ours

Change-Id: Ia9508033be03059a382abfaaa2adfc3e415df81b