Merge "Enabling mediaprovider MTS tests to be included in android-mts-mediaprovider as well as android-mts." am: d5942bb8e7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f08c3b5116b7143cc693d7d9d9a225404e840aa