Merge "MediaScannerTest: Stopped using resources in apk" am: 1fe284e9c1 am: aee5f8f1a7

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

Change-Id: I9f34a71fd48bf8130e603b2a5de0e08e09a7b040