Merge "Make sfps indicator window show for all users by changing type" into...

Merge "Make sfps indicator window show for all users by changing type" into tm-qpr-dev am: fe689eef

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



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