Merge "Fix delete face button disappear after reenroll" into udc-d1-dev am:...

Merge "Fix delete face button disappear after reenroll" into udc-d1-dev am: 0f63a450 am: 02f72c16 am: 7068c747

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



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