Merge change 10027

* changes:
  Fixed Issue 2682: ContentProvider query() SDK docs deprecated