Merge "Ambient Display: Fix race with coloring and redaction" into nyc-mr2-dev
am: 02f07cce35

Change-Id: I3890e276ab985977f7e02d77c91c403700c254d6