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

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



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