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

Change-Id: I7d4316b8cccf4a2cc5106778d2e20ab5d80a8577