Merge "Use correct exit_status" am: d5a99ba576

Original change: https://android-review.googlesource.com/c/platform/tools/test/connectivity/+/2037087

Change-Id: I83e0cc5336797f93373f854b49b17e8b5aa9f65c