Merge "Add target for ThemePicker instrumented tests" into tm-qpr-dev am: 0ca33a6a

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



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