Merge "Fix flash of ambient on fp unlock" into oc-dev
am: c885c24e10

Change-Id: I70a913e7743e79e90e3d5c1e8bbcb8e6a4071193