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

Change-Id: I7ad0c7bcc4bd6ac780bbff2fa7ac3380ea3031b3