[automerger skipped] Merge "Refine EffectProxy logic" am: f00ff23b am:...

[automerger skipped] Merge "Refine EffectProxy logic" am: f00ff23b am: 73aa4b29 am: f5364fcf am: ac9a1393 am: 40a2c475 am: 7f672464 -s ours

am skip reason: Merged-In I468d7e8712d7b098d869f147a4b40881ef11cabb with SHA-1 2bc0be83 is already in history

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



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