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