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

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

Change-Id: I1e0ba658e2230d666dd8eaa7497a4986fece264b