Merge "Remove flicker when unlocking + turning off screen" into udc-qpr-dev am: 75748b6b

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



Change-Id: I3611e025a4baed5ff467ae14e156b8fad86c674c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>