Merge "SF: fix frame rate for layer tree" into sc-dev am: 3871daf53a am: 10c357b76e

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

Change-Id: Ic8db5adb263e92f64ccc37726019c30c1b70e2e9