[automerger skipped] Merge "APM: Create multiple MSD patches" am: 6f7a1f3e...

[automerger skipped] Merge "APM: Create multiple MSD patches" am: 6f7a1f3e am: c430a239 am: cda09c83 -s ours

am skip reason: Change-Id I59a8976ce82dba04ca69347afc192e9143ef3629 with SHA-1 6fb3449e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic50d86f93c813525a4943cf678e9b3329b1fafab