Merge "Use 60Hz frame calculations instead of magic numbers" into tm-dev am:...

Merge "Use 60Hz frame calculations instead of magic numbers" into tm-dev am: 78094046 am: 4d9105e5 am: 7d17495f

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



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