[automerger skipped] Merge "Enabling mediaprovider MTS tests to be included in android-mts-mediaprovider as well as android-mts." into mainline-prod am: fce98ccba1 -s ours

am skip reason: Change-Id I3852ac8e3f2b423722043225e728de48bab05edd with SHA-1 61f0599e95 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/13385594

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4ba644db636e503c0d965f6806bbf4092166cc7