Merge "Fix Robolectric tests that use JobScheduler"