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

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

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