Merge "Fix large clock flickers when animated in Felix" into udc-dev am: ba0c5b429b am: 36aad5e834 am: 6b7bfa8616 am: b6228a3b92

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

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