Merge "Add test for MANAGE_EXTERNAL_STORAGE UI"