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

[automerger skipped] Merge "AudioFlinger: Use scoped_lock to prevent deadlock" into udc-dev-plus-aosp am: 88a123a8 am: 210fe180 -s ours am: eb321338 -s ours

am skip reason: Merged-In I63906b09dcee8ed18202520aa5e823ec2362a327 with SHA-1 3115bd1e is already in history

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



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