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

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

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



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