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

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

Change-Id: I791333c7054648ecac6675857e83e2ce14e4e847