Merge "Migrate frameworks/base/media/tests/MtpTests to androidx.test"