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

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



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