[automerger skipped] Merge "ADD CUJ_LOCKSCREEN_CLOCK_MOVE_ANIMATION" into...

[automerger skipped] Merge "ADD CUJ_LOCKSCREEN_CLOCK_MOVE_ANIMATION" into tm-qpr-dev am: 065d7e78 am: 9c0afb96 -s ours am: e6273eda -s ours

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

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



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