Merge "SF: Fix feedback loop with refresh rate overlay" into tm-dev am:...

Merge "SF: Fix feedback loop with refresh rate overlay" into tm-dev am: f8ba0b95 am: 16d0bb19 am: f73f7b2d

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



Change-Id: I8152b554c08ffc2d8aa750b5a263453059cfc3f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>