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

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



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