[automerger skipped] Merge "AudioFlinger: Fix lock inversion for...

[automerger skipped] Merge "AudioFlinger: Fix lock inversion for timestampCorrectionEnabled" into main am: 69639a63 am: 6dee34f9 -s ours

am skip reason: Merged-In I31b6c3494ba710fba9ebee42f6570ff9b38fe221 with SHA-1 1381a070 is already in history

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



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