Merge "Ignore package mode for MANAGE_EXTERNAL_STORAGE"