Merge "Enable STEP_CLOCK_ANIMATION in Droidfood" into udc-dev am: 22f7c032 am: 24fddc9e am: 39ad605c

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



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