Merge "Revert "Replace channel layout for 13.0"" into main am: 7a80a544a3 am: 94f10f4875

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

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