Merge "codec2: fix gralloc4 mapping" am: 830aea3c am: acf09b39 am: ff18a43c am: f47040e0

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



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