[automerger skipped] Merge "Remove sidefps toggle from SUW." into tm-qpr-dev am: 94ddcba809
am: 8bc66cbb9f
-s ours
am skip reason: Merged-In I0ea63a61908b45399ba09ff31fd8fe6a4aacfb41 with SHA-1 cfaf707a78
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20442178
Change-Id: I076b8e41b015bf1c4b551d6023bc57a220ea9471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: