Merge "media reliability folks doing mainline machinery" am: cde72466dc

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

Change-Id: I270526bcd71634cfefd6cc724912184431c1b768