[automerger skipped] Merge "Crash the process when midi extraction times out"...

[automerger skipped] Merge "Crash the process when midi extraction times out" am: 3723513e -s ours am: 19ab5683 -s ours

am skip reason: Change-Id I8d2fd85f91d1d2749c5620cf8518583076d2f6d7 with SHA-1 166a84bf is in history

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

Change-Id: I2692f253cf0760d48ca7cdd53c59e026c069f4e6