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

Change-Id: I562100ca7f655e2b5d372f6a139b0a2b4821315c