Merge "Revert "Add channel layout for 13.0"" into main am: 289767abf4

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

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