Merge "Fix flicker when unlocking the screen." into sc-dev am: 6431f95dc7 am: 72f4fcddc0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15660797

Change-Id: Ief9cc333cbb724ed1a406cbf110528ef1e913616