Merge "Update AppOpsService to remove user state after the user is removed."