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

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



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