am 1c8e40c1: Fixing legacy contacts API breakage uncovered by CTS tests

Merge commit '1c8e40c18f92722b9bec6e8ce2e345a9828efa16' into eclair-plus-aosp

* commit '1c8e40c18f92722b9bec6e8ce2e345a9828efa16':
  Fixing legacy contacts API breakage uncovered by CTS tests