Merge "ExternalStorageProvider: Add an exported flag in manifest"