Merge "APM: Create multiple MSD patches" am: 6f7a1f3ed0 am: c430a2396b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I287bd8322e8135b9d787a1b20f14b63379bf5eaf