[automerger skipped] [automerged blank] C2Allocator: protetct memory mappings...

[automerger skipped] [automerged blank] C2Allocator: protetct memory mappings from race condition 2p: 5cbca291 2p: 1d42f8d4 am: 50392188 -s ours am: b8e282f2 -s ours am: 6b4099f9 -s ours

am skip reason: Merged-In Icf6d00491438176e9092b67974a9388e803ac130 with SHA-1 530a22aa is already in history

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



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