Merge change 22534 into eclair

* changes:
  ContactsContract: Fix null pointer exception in openContactPhotoInputStream()