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

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



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