Merge "Configure existing ThemePicker Robolectric tests to run with atest." into tm-qpr-dev