Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am: d71cc3b72e
am: 9e1b7759dc

Change-Id: I9b6e9c02f2237c48fdac4fd6f0c4afc4eb8b03cd