Merge "adb: Fix PTY logic for non-interactive shells."