Merge "Fix NullPointer Exception in testharness command" am: 881c4ad3e2 am: 079af6fd19 am: 11dd83b88e

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

Change-Id: Ia926b06460f0333f74c5f6c732587793c629243d