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

Change-Id: I2eed4a8bfbc8ded0f5d12b3284d8ae5a0cfb1823