Merge change 21997 into eclair

* changes:
  A test for ContactsContract.Contacts.getPhotoUri