Merge "Fixes error caused by wrong test runner" into udc-qpr-dev am: cbd46abe

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/24211866



Change-Id: Iaa8f778f91dc9c7966b5a3b06d865689ee4cdaea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>