[automerger skipped] Merge "C2AllocatorBlob: allow multiple maps" into...

[automerger skipped] Merge "C2AllocatorBlob: allow multiple maps" into mainline-prod am: 415ead8f -s ours am: 2fd0a98e -s ours am: b8a7d9c5 -s ours

am skip reason: Merged-In Ief24371e19c8e957ea218ffd9bbfd516353b0cc9 with SHA-1 a8ba4c1d is already in history

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

Change-Id: I515c36ae0df6745dbaed70f48d41307592b0db8c