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

Change-Id: If3a88583281aca94caaa7614460b9249a2689fc5