[automerger skipped] Cleanup SFPS indicator code am: 35a34be846 -s ours

am skip reason: Merged-In I33660b853c6f266378e3a9433c933bcd3f2a70a1 with SHA-1 7d42eee848 is already in history

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

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