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

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



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