Merge "Fix flickering issues with FLAG_SHOW_WHEN_LOCKED and fingerprint wake" into nyc-mr1-dev am: 4d140b72f2
am: 076d79aa40

Change-Id: I4485756fb05c5c173cac6b9312ad8cc988f5db54