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

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



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