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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d39d9ffb09d667c0ff667a7cb47363a89d9ee9a