Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am: d71cc3b72e am: d4b1a0985b
am: 517927fa1a

Change-Id: I0c4515a1abd0d58b81fd0d4090a609507436ee4c