Merge "Fix FaceUpdater.enroll unit test fail in aosp" into udc-dev