Merge "Work on issue #62390590: SecurityException in JobIntentService$..." into oc-dev am: 4eb76b2db8
am: d066c0c6cb

Change-Id: I435c71537d41f94d4e9af2e07a9f2a9258f2eab5