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

Change-Id: I6f3514154e75a74c69bdf5292dc73783e652a9ec