Merge "Do not darken scrims when unlocking with fp" into pi-dev
am: 05b3d95b65

Change-Id: I35205e0b1e3ec5d1728826028ea88a230fb174fb