[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 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: I618dc14d1926fabb952adc5139b468a88d6c2722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>