Merge "Fix test harness mode" into sc-dev am: c11f9eca7b

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

Change-Id: I2569bc149ec82a511e775e017400ccc5d3c71b65