[automerger skipped] [automerge] C2Allocator: protetct memory mappings from...

[automerger skipped] [automerge] C2Allocator: protetct memory mappings from race condition 2p: 5cbca291 am: a8b5ecd4 am: a74e1bbe -s ours am: e881ce81 -s ours am: 61747cbe -s ours am: e19138a5 -s ours am: a1a71a02 -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: I51802b6b24266120b5c57a44e80de59b7690e039
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>