[automerger skipped] Merge "Fix flicker when unlocking the screen." into sc-dev am: 6431f95dc7 am: 7ee7447166 -s ours am: f844a42501 -s ours am: 8ad9f7d6f1 -s ours

am skip reason: Merged-In Iacd46b99c5a86c8f7a7706b91b0b78a3beb4c414 with SHA-1 c2dda240a7 is already in history

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

Change-Id: I089c7231a01ac82248db66dad02fd1fa8b7d86db