Merge "SideFPS UX updates" into tm-qpr-dev am: 2ff2a64c

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



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