[automerger skipped] [RESTRICT AUTOMERGE] C2AllocatorIon:protect mMappings using mutex am: ac5f5cade2 am: 3b8914d681 -s ours am: 21f7fa7ba4 -s ours am: c284e722b9 -s ours am: 86cfdb6d3f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3c5ed240268f535745d2745c75aa962f824bf2ba