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

[automerger skipped] Merge "EffectProxy return the active sub-effect descriptor" into main am: 7abcc988 am: 965bdfbc am: 467e03b4 am: fe62dcaf am: 7529da76 -s ours

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

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



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