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