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

Change-Id: I60aadf3d73de86b4e83dc0fa228e1ac9a21db86f