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

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

Change-Id: I6c60b0c938548c9dc87b5923c739d8efadbf110b