Merge "Revert^2 "Replace channel layout for 13.0"" into main am: 0d06e3c3bb

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

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