[automerger skipped] Cleaned up side fps logic am: 20987e7f am: e3ed6706 -s ours

am skip reason: Merged-In I6a872757ecb6294b55536bea75919bb53db52603 with SHA-1 5d832aa1 is already in history

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



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