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

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

Change-Id: Ibb032b545c1379bbee40276891da23e0678aabe1