am b18b0956: Merge change 25829 into eclair

Merge commit 'b18b0956afbe0730ced1c5b95c0071dba447765e' into eclair-plus-aosp

* commit 'b18b0956afbe0730ced1c5b95c0071dba447765e':
  Revert "ContactsContract: Adding joined columns to the Data class definition."