am 4d084b1b: am 346d359c: am 1c6905d2: Follow ContactsContract API changes

* commit '4d084b1b20b8171048a1dbc6f871d10c533414dd':
  Follow ContactsContract API changes