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

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



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