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

Change-Id: I94444be4b8ac554735fdcb4cc8f46e5e1d1113c3