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

Change-Id: Ic2cb9f827131aeb44a330e51516401bc0808e8d5