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

Change-Id: Id3b951d73e784b6bb7300d62df7df7957448f185