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: 4d228ed4 am: df695394 am: fbf7ce82

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



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