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

Change-Id: I71ec6332996262025d65099b92603719753d8fe2