Merge "Fix large clock flickers when animated in Felix" into udc-dev am: ba0c5b429b am: 36aad5e834 am: 621c58af82

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

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