Merge "Use correct user id for permission check for instant foreground service"