Merge "Codec2: vndk: lock P010 with gralloc4 mapper first" am: 7df4f8c371 am: 062e0be1ee

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

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