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

Change-Id: I9c2c42692f01b7665fb11d6e0f47c707d3c630fc