Merge "Enable STEP_CLOCK_ANIMATION For Droidfood" into tm-qpr-dev am: 82c8b4e3 am: 87ec2fc5

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



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