Merge "Fix jank in CUJ_SCREEN_OFF" into udc-dev am: f3ba5399 am: fc2f23d0

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



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