Merge "Fix test harness mode" into sc-dev am: c11f9eca am: 6a1e1427 am: 4687f645

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

Change-Id: Ie59a56cab15f253be88d15378969440a70ebfaf6