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

[automerger skipped] Merge "Correct attribution source for MMAP thread" into tm-dev am: 86719540 am: 7664ead3 am: fc10c4dc -s ours am: 6214eb61 -s ours am: b27c3ae1 -s ours am: 44f7e870 -s ours am: 515fa060 -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/+/23452302



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