[automerger skipped] Merge "Add debug logging to SideFpsController" into...

[automerger skipped] Merge "Add debug logging to SideFpsController" into 24D1-dev am: 4de220f9 -s ours

am skip reason: Merged-In Ied1e743db40ecffc0ed07aa506eaf9be82c57a0a with SHA-1 9d0d1c55 is already in history

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



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