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

Change-Id: Ief80079e0cda4aca334f513409c43feae3d34b28