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

Change-Id: Ibbff840983dc3f15745275d44393645f110b74c1