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

Change-Id: I3aa5bbccbc669499a8ab6b12f180a7f5841164c3