Merge "Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am: d71cc3b7 am: d4b1a098 am: 517927fa" into oc-mr1-dev-plus-aosp