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

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

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

Change-Id: I9310872d813588689eeac2f6715ee82cc47a10c9