Merge "Fix lockscreen jump-cutting in during screen off." into tm-qpr-dev am: 0d0f74b7

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



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