Merge "Fix issue #62390590:  SecurityException in JobIntentService$..." into oc-dev
am: 69c3a1d45a

Change-Id: Iff54638e534562f573b0dc4af26d66e203867d1d