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