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

Merge "Fix modulo div by 0 in Choreographer." into tm-dev am: 6dadf45f am: 1cb7ea16 am: 019704ac

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



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