Merge "Merge "AOD: Fix flicker when unlocking with fingerprint" into oc-dr1-dev am: 88265d29bd" into oc-dr1-dev-plus-aosp