[automerger skipped] Merge "Correct attribution source for MMAP thread" into...

[automerger skipped] Merge "Correct attribution source for MMAP thread" into sc-dev am: 0454d934 am: 47c7ac57 am: 869736d0 -s ours am: 721430b7 -s ours am: c6326884 -s ours am: 3b6c97c6 -s ours am: ec42a61e -s ours

am skip reason: Merged-In Ia6fc1bff815bbbb2fee8bc1a60569a663a713e4b with SHA-1 0230540d is already in history

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



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