Merge "Remove Descriptor proxy field from individual effect" am: d8371de6

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



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