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

Change-Id: I93e063134e6226adc343368fc31be1f9848d2aff