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: 4f70f60f am: 5f68c104 am: a121598f

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



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