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: 329efa5d

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



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