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

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

Change-Id: Ie1a1ac73f1b02315e471b374f3484b7dc39ad0ff