Merge change 20945

* changes:
  contrary to popular belief ContentResolver.query can return null. so check.