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

Change-Id: I71017d8fd6efee24d437f66b2c5be34068bd3dfc