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

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



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