[automerger skipped] Merge "SideFPS UX updates" into tm-qpr-dev am: 2ff2a64c...

[automerger skipped] Merge "SideFPS UX updates" into tm-qpr-dev am: 2ff2a64c am: 315f6f12 -s ours

am skip reason: Merged-In I1b8a63cc76cdb5d8e46206ba1bee8fc3246a8cdc with SHA-1 60dedc99 is already in history

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



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