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

Change-Id: Ic731a28f8fae87758dd5774dcf71c2ebd2f5c3d9