am 07b554fc: Merge "Fix lock ordering in JobScheduler" into lmp-dev

* commit '07b554fcce08611872ea053ea9c97fa2671fc6db':
  Fix lock ordering in JobScheduler