Merge "Finish moving Robolectric tests to tests/robotests" into tm-qpr-dev am: 93ea52fe

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



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