Merge "[automerger skipped] [automerge] C2Allocator: protetct memory mappings...

Merge "[automerger skipped] [automerge] C2Allocator: protetct memory mappings from race condition 2p: 5cbca291 am: a8b5ecd4 am: a74e1bbe -s ours am: e881ce81 -s ours am: 137f6bd0 -s ours" into tm-d1-dev-plus-aosp am: 2e73b3bb -s ours am: 62543f7c -s ours

am skip reason: Merged-In Icf6d00491438176e9092b67974a9388e803ac130 with SHA-1 5cbca291 is already in history

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



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