Merge "Revert "Add TEST_MAPPING file for ExternalStorageProvider package"" into main