Merge "Removes duplicate SFPS string and updates references" into tm-qpr-dev am: af2896195e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20521647

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