[automerger skipped] Merge "Add SideFpsController dump" into tm-qpr-dev am:...

[automerger skipped] Merge "Add SideFpsController dump" into tm-qpr-dev am: 9935dae6 am: b5bcb34c -s ours

am skip reason: Merged-In I7dcb1649e5790ec36232cb48ac5649b7b0439d83 with SHA-1 496f0aaa is already in history

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



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