Merge "Merge "Fix jank in CUJ_SCREEN_OFF_SHOW_AOD" into udc-dev am:...

Merge "Merge "Fix jank in CUJ_SCREEN_OFF_SHOW_AOD" into udc-dev am: c09055b4" into udc-mainline-prod am: d4bb2dde

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



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