[automerger skipped] Merge "C2AllocatorGralloc: Resolve implementation defined...

[automerger skipped] Merge "C2AllocatorGralloc: Resolve implementation defined format." into main am: 68ac0bcf am: 6192eb01 am: e679457d am: 94204cb5 am: 8d10b83c -s ours

am skip reason: Merged-In I8070d64a90ab14c700419399c71001a41e6e8938 with SHA-1 e40047c6 is already in history

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



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