Merge "Include uid in device admin pref id."