[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: 6d13d2af -s ours am: 94788727 -s ours am: b77ce066 -s ours am: 382afea9 -s ours am: 8cbd8b99 -s ours am: c410d75a -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: I9f65b181c17b1b9884e4b61e617f041d388b1f3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>