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

Change-Id: Icd1e169bb9538e1ac778469393f4a3be7880368b