[automerger skipped] Merge "Fix device effect instatiation" into main am:...

[automerger skipped] Merge "Fix device effect instatiation" into main am: e4166084 am: defa9989 -s ours

am skip reason: Merged-In I13676bc6564b24cf3b8d56e0646dc263599fea35 with SHA-1 9b5cbdbe is already in history

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



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