Merge "lvm: Extend multichannel support to 24 channels" am: 71bbaf6e46 am: a844a659b3 am: c6959379af

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I203660ab3abd73bf1d28a12dba20a0ba217fa635