Merge "Fix FaceUpdater.enroll unit test fail in aosp" into udc-dev am: 92e76086 am: c59fbb1d

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



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