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 am: 9ad4ed36 am: 0f3d50b4

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



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