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

Change-Id: I578cbe489e705b77689860eb0cea7d79ab6cc4c8