Merge "Fix AOD flicker during lockscreen transition" into udc-qpr-dev am: f65da1a341

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

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