Merge "Fix the error with EffectProxy open" am: 151890f5 am: 005d7c51 am:...

Merge "Fix the error with EffectProxy open" am: 151890f5 am: 005d7c51 am: 7558913a am: be9b9958 am: dcdc63f4

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



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