Merge "Fix device effect instatiation" into main am: e4166084bf

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

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