Merge "Let testB141603906 run over ADB-over-network" am: 3cded8dc20

Original change: https://android-review.googlesource.com/c/platform/cts/+/1349862

Change-Id: Id15fb6f4ad19061ffe1564030e5108910a2cc99d