am 697869c4: am 6fefa36c: Merge "adb: Fix PTY logic for non-interactive shells."

* commit '697869c4fde93a23cda3a0d789c1f101f82eb157':
  adb: Fix PTY logic for non-interactive shells.