Merge "Add android:label to ExternalStorageProvider."