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

Change-Id: Ifbc178292194781e9fa8d8f3d6ee232aa0142e0f