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

Change-Id: I6ce302edc125180b62bb43dcabc61878892fb82f