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

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



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