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

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

Change-Id: Ic0a1e34283eda50ef856749a5efd6d9898b09b45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>