Merge "Updates sfps indicator placement calculations" into tm-qpr-dev am: 13878b35

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



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