[automerger skipped] Merge "Make sfps indicator window show for all users by...

[automerger skipped] Merge "Make sfps indicator window show for all users by changing type" into tm-qpr-dev am: fe689eef am: 3148fa74 -s ours

am skip reason: Merged-In I5cf464608032edf4fd07ee2bfb6b457616d19c1d with SHA-1 d40e081b is already in history

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



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