Merge "Fix channel masks in LVM tests" am: b8f3cf86f6

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

Change-Id: I0cfe2ed8310dd1dbf099e34aad8f69803998b1f5