[automerger skipped] Merge ab/7061308 into stage. am: eed2134cc4 -s ours am: 6dbb974257 -s ours

am skip reason: Change-Id I242e5b8a82ab0ece8b067ee6d63a8c65f59aae6d with SHA-1 aaf49d3e71 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/13658568

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibeb81a760ee61786cfdef66fc80e751a63210818