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
am: 7f218c3a7b

Change-Id: I597c714d81db2e8f51b9bf803a002d21fe7143c3