Merge "Support MSD patches with channel index masks" am: c60acf0b

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



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