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