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

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



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