Merge "media reliability folks doing mainline machinery" am: cde72466 am:...

Merge "media reliability folks doing mainline machinery" am: cde72466 am: 6204793c am: 0e5f4638 am: 0fa87200

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

Change-Id: Ie104d2b666912f0513a4d68a4be90b34cf028231