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

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

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