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

Merge "Remove Descriptor proxy field from individual effect" into udc-dev am: eafc269c am: 7e0dedc1 am: d24893f1 am: aff94341

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/22955998



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