[automerger skipped] Merge "AppendData:MPEG4Writer&Extractor,MediaAppender"...

[automerger skipped] Merge "AppendData:MPEG4Writer&Extractor,MediaAppender" into sc-dev am: a1952145 am: 06fe57a5 -s ours

am skip reason: Merged-In I3f2bfa6b92d85c3a87ac740b2d401dcb10d7976e with SHA-1 13957711 is already in history

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

Change-Id: I5c443de2be7137b6676cb2a5092c2e0f8a86f47f