Merge "Revert "Request MANAGE_EXTERNAL_STORAGE permission""