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

Change-Id: Ic8c25df8a7686551100edde91df17b944983ded0