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: Iea6e741ce6f55b488697410090c5729acef86394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>