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

Change-Id: Ibf4d518b1292e6768df43d65c71923921448043f