Merge "Reduce the number of iterations in PreEnrollTest am: 744b028807 am: f80eb3cb9e am: 8611b593d0" into rvc-qpr-dev-plus-aosp