[automerger skipped] Merge "AudioFlinger: fix regression on device effect...

[automerger skipped] Merge "AudioFlinger: fix regression on device effect introduced locking order" into main am: 54e1f4c0 am: de8e0d28 -s ours

am skip reason: Merged-In I6667c3ef1b77708ccb4d644fd1b53a2fe3896b72 with SHA-1 fce3b6c9 is already in history

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



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