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

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



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