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

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

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