[automerger skipped] Merge "Removes duplicate SFPS string and updates...

[automerger skipped] Merge "Removes duplicate SFPS string and updates references" into tm-qpr-dev am: af289619 am: b7eef9c0 -s ours

am skip reason: Merged-In I259669a09f5535f3a776793659e5bc6bdb90a44c with SHA-1 9d6a869e is already in history

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



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