Merge "Remove the workaround of extra enrollment for the fixed b/243129174" into udc-qpr-dev