Merge "Change to output ArrayMode if using SkipCutBuffer" into main am: 0f1a26a973 am: 8242e5a61c

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

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