Merge "Merge "Fix issue #62787070: restart due to NPE in JobServiceContext..." into oc-dev am: fa791d5e97 am: 3049791af6" into oc-dr1-dev-plus-aosp
am: 5a4f1bda89

Change-Id: Ib2b8faa2635d1dcccab49ecfcae9d8adf72bbe81