Merge "Merge "Fix issue #62787070: restart due to NPE in JobServiceContext..." into oc-dev am: fa791d5e am: 3049791a" into oc-dr1-dev-plus-aosp