Merge "MediaFrameworkTest: Fix file access issues from /sdcard/" into main am: 05909bca25 am: dfb21ced3f am: 3f56ae3f19 am: 9c1f1172f5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2782296

Change-Id: I9a3c79070f9111d716eca3ff15178f32a535a8e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>