[automerger skipped] Merge "Revert^2 "ADD...

[automerger skipped] Merge "Revert^2 "ADD CUJ_LOCKSCREEN_CLOCK_MOVE_ANIMATION"" into tm-qpr-dev am: a23734e2 -s ours am: 9f80dd76 -s ours

am skip reason: Merged-In I8a574715e3a341b7a3a0edd368cdb0015b8b4b50 with SHA-1 e849335b is already in history

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



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