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

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

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



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