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

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

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