Merge "Replace channel layout for 13.0" into main am: b47b380280 am: 33e6eac300

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

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