am 670baeca: DO NOT MERGE - Fix JobScheduler CTS tests

* commit '670baecad4d623b0e8bdd488b4e5925ffe9b943e':
  DO NOT MERGE - Fix JobScheduler CTS tests