[automerger skipped] Merge "Fix flicker when unlocking the screen." into...

[automerger skipped] Merge "Fix flicker when unlocking the screen." into sc-dev am: 6431f95d am: 7ee74471 -s ours am: d3758a91 -s ours am: 4255685b -s ours

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

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

Change-Id: Ic5eaff06ec70a499ac91f60467c55fda246e4060