Merge "Enable testExtractor when media datasource return error" am: 676b5c49a1 am: 45e5fde0b4 am: cf5fcd9eea

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

Change-Id: Ibfb6440ee14c38aa5377ab7aa511a76899755b3f