Merge "Fix FaceUpdater.enroll unit test fail in aosp" into udc-dev am: 92e760861d
am: c59fbb1d28
am: 98fa5ffbfa
am: 828bd8db86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155080 Change-Id: I50d205464570fec5789b63d2c7c1ebc026523a18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: