tree c40ccbae8304fe70f0ede9959a1b1aab1088aaff
parent bfa95b98c91f451a00dac866355f7d1e8d0ab543
parent b7eef9c024c41b03da44826dfd2c47ee65efd3bc
author Grace Cheng <graciecheng@google.com> 1670049996 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670049996 +0000

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

am skip reason: Merged-In I259669a09f5535f3a776793659e5bc6bdb90a44c with SHA-1 9d6a869ebe 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>