[automerger skipped] Merge "AudioFlinger: Update MmapThread annotations" into...

[automerger skipped] Merge "AudioFlinger: Update MmapThread annotations" into main am: 5eb2d08b am: 2e54ead3 am: f7061e8f -s ours

am skip reason: Merged-In I748c2c17fd220ad2b5c5d2574077fa1c409476b5 with SHA-1 3f49ebb7 is already in history

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



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