Merge "Separate ambient display triggers" into nyc-mr1-dev am: ee5eef1492
am: f33b98b750

Change-Id: I61777d38647d8b6f858de9feadf7ae3c8a9b7ebd