[automerger skipped] Merge "AudioFlinger: Use scoped_lock to prevent deadlock"...

[automerger skipped] Merge "AudioFlinger: Use scoped_lock to prevent deadlock" into main am: adc93e6e am: 29f8acca -s ours am: 9e337be6 -s ours am: 92912750 -s ours

am skip reason: Merged-In I63906b09dcee8ed18202520aa5e823ec2362a327 with SHA-1 40307f54 is already in history

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



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