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

Change-Id: I9f3d116efa02bfca1df96414110722afe143a6dc