Merge "Separate ambient display triggers" into nyc-mr1-dev
am: 24ddbc8038

Change-Id: I701f6ce1305fb200a03bcd879513aceada1f7072