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

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



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