Merge "Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE""