Merge "Move shared test code into separate directory" into udc-qpr-dev am: dc5688f3

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



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