Merge "MediaExtractorTest: remove MediaCodec blocking call to avoid deadlock" into stage-aosp-sc-ts-dev am: 3d36469009 am: e3374a6e05 am: f1507aaca7

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/15674275

Change-Id: I50f0178ac1d3fa1d78ba77516cfea3d44921422f