Merge "Merge "Enable STEP_CLOCK_ANIMATION in Droidfood" into udc-dev am:...

Merge "Merge "Enable STEP_CLOCK_ANIMATION in Droidfood" into udc-dev am: 22f7c032 am: 24fddc9e am: 39ad605c" into udc-qpr-dev-plus-aosp am: 089fb864

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



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