Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am: d71cc3b72e
am: d4b1a0985b

Change-Id: I18839e2c5c1f64639a7920d64f3271cd2d6dc1a4