Merge "Add SideFps AlternateBouncer" into tm-qpr-dev am: 2818aa4132

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

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