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

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

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