[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 skip reason: skip tag Change-Id Ief24371e19c8e957ea218ffd9bbfd516353b0cc9 with SHA-1 d04f34cd is already in history

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

Change-Id: I434d1fef6262977c6cb134c0003c5cf44bb92250