[automerger skipped] Revert^2 "ADD CUJ_LOCKSCREEN_CLOCK_MOVE_ANIMATION" am: 88f7d74d -s ours am: 48fa52b6 -s ours am: 1875587f -s ours am: e8e38663 -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: I5217c46c89b59855bff16b57f11b5fb51d8afc14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>