[automerger skipped] Merge "Refine EffectProxy logic" into udc-qpr-dev am:...

[automerger skipped] Merge "Refine EffectProxy logic" into udc-qpr-dev am: e5490631 -s ours am: 787f7e3a -s ours

am skip reason: Merged-In I468d7e8712d7b098d869f147a4b40881ef11cabb with SHA-1 79f98745 is already in history

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



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