Merge "Fix pty.bug_28979140 test in Bionic"