Merge "Merge "Demote STEP_CLOCK_ANIMATION from Droidfood to Teamfood" into tm-qpr-dev am: f7a8c8cc am: 8cbf51b1" into udc-dev am: 7ca9cdec am: 66b566c2

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



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