[automerger skipped] [RESTRICT AUTOMERGE] C2AllocatorIon:protect mMappings using mutex am: ac5f5cad am: 3b8914d6 -s ours am: 21f7fa7b -s ours am: c284e722 -s ours am: 86cfdb6d -s ours am: dcefffc4 -s ours am: d8643faf -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id180a29e5af9b187f230d97e7037fdafb99d47a4