Merge "Fix face model delete message" into udc-d1-dev am: d56f96aa

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



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