Merge "Remove Descriptor proxy field from individual effect" into udc-dev am:...

Merge "Remove Descriptor proxy field from individual effect" into udc-dev am: 51fd9e9e am: 54bf762b

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



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