Merge "adb: don't use parameterized in test_adb.py." am: 648266ab am:...

Merge "adb: don't use parameterized in test_adb.py." am: 648266ab am: 1d735521 am: f8edf1fc am: 9088b75b

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1322179

Change-Id: I3b7237d6f361a432b11f3e76b7cfd5bbe3bf7478