Merge "Fix channel masks in LVM tests" am: b8f3cf86f6 am: 1f0bda6c44 am: 39d10ce4e0 am: f4759c6749

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1453995

Change-Id: If5fd89fa0e3c45eadd7f2cb60b22f760d12372db