Merge "Support MSD patches with channel index masks" am: c60acf0b7d am: 0a03990a44

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

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