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

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



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