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

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

Change-Id: I1dfbf85812064e6e4d03f30911aaff070094558b