Merge "adb: fix flakiness in PTY shell protocol." am: b27365510d am: 9e3e8c40e2 am: 00e66f971d

Change-Id: If476dfcdbe6a23cce120ecc6a5d7e25f580d51b4