Merge "Fix lockdown icon dark mode coloring." into pi-dev
am: 44aeaafc34

Change-Id: Ic0e1c72cf821396cdb8ad59f04169b25cc681c66