Merge "adb: fix test_device.py shell protocol checks."
am: 52eb602

* commit '52eb6025edad892b7e346ad87dd52101a0ef1a6a':
  adb: fix test_device.py shell protocol checks.

Change-Id: Ie3dfde1bfda3172125df7f1487755e720f43133f