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: 6b24ac79 am: fe92189e am: 69d17c6c

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



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