Merge "Add channel layout for 13.0" into main am: 379a3d89dd

Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/2579913

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