Merge "Fix NullPointer Exception in testharness command" am: 881c4ad3e2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674567

Change-Id: I88cbc7392fcdfc8dcdac005ae636d3ada57c28c5