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: 92efa209 am: d3b62976

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



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