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

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

Change-Id: I75e7f33a26ddf9839dfadd392815085fc51bb5b7