Merge "Reduce the number of iterations in PreEnrollTest am: 744b028807 am: 798629af9e" into rvc-d1-dev-plus-aosp am: 5fe5f24247

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11712201

Change-Id: I9e626d62df76ade64eb429fee127452132eb1796