Merge "codec2: Queue ROI info buffer for surface mode" into main am: c7390d2fc5 am: 53e4f63b5d

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

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