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

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

am skip reason: Merged-In I31b6c3494ba710fba9ebee42f6570ff9b38fe221 with SHA-1 95c94a2e is already in history

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



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