Merge "Migrate frameworks/base/packages/ExternalStorageProvider/tests to androidx.test"