[automerger skipped] Merge "EffectProxy return the active sub-effect...

[automerger skipped] Merge "EffectProxy return the active sub-effect descriptor" into udc-qpr-dev am: d83de550 -s ours

am skip reason: Merged-In I13d92f9d8345e7d38e886adaf82f4e67eebea5a8 with SHA-1 df7bd8b2 is already in history

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



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