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

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

Change-Id: I587b9c7497a297ba874cf7bcc7ae70ee91447ac5