Merge "Disallow the INTERACT_ACROSS_USERS permission for system apps"