am 1c6905d2: Follow ContactsContract API changes

* commit '1c6905d2f799d81d5cb847c44fca7dc7d36fd684':
  Follow ContactsContract API changes