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: fa7ab318

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



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