Merge "Separate ambient display triggers" into nyc-mr1-dev
am: 52af7e0759

Change-Id: I61ccb55ed8d4226fa46fdad8dd7845dfae3bc2a3