Merge "Fix modulo div by 0 in Choreographer." into tm-dev am: 6dadf45f am: 994032fc

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



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