[automerger skipped] Merge "Add phone, tablet, device fp deletion strings."...

[automerger skipped] Merge "Add phone, tablet, device fp deletion strings." into tm-qpr-dev am: 8ff02347 am: eafa2982 -s ours

am skip reason: skipped by user augale

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



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