Merge "codec2: fix gralloc4 mapping" am: 830aea3c

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



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