Merge "Fix the error with EffectProxy open" am: 151890f585 am: 005d7c5195

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

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