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: Id7e8f94bbb0cb0e2d4dde01b844e057d38a4b5f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>