[automerger skipped] Merge "Remove Descriptor proxy field from individual...

[automerger skipped] Merge "Remove Descriptor proxy field from individual effect" am: d8371de6 am: a625e430 am: 87334ea4 -s ours

am skip reason: Merged-In Ieab9d146368e7abff73b9917967024d612f9bc4c with SHA-1 8f840ab0 is already in history

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



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