Merge "Codec2: vndk: lock P010 with gralloc4 mapper first" am: 7df4f8c3 am:...

Merge "Codec2: vndk: lock P010 with gralloc4 mapper first" am: 7df4f8c3 am: 062e0be1 am: b1b87345

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



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