Merge "Remove the workaround of extra enrollment for the fixed b/243129174"...

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

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



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