Separate ambient display triggers am: 82829ee0b1
am: 5ba2074e31

Change-Id: I023918a3d862502de6a4058609e29b8867e39f0c