Ambient Display: Fix race with coloring and redaction am: e5726a2082
am: dff956b0e0

Change-Id: I18d7da64d56f70923926df6231472a2c3a909f15