Merge "Follow ContactsContract API changes" into lmp-dev
tree: 480431216d5f66f97cd12f851622411e96e78de2
  1. src/
  2. TestCommon/
  3. tests/