am 056e4a7b: Merge "Follow ContactsContract API changes" into lmp-dev

* commit '056e4a7b42973c0c5c4a35c70b995c007bd68cb7':
  Follow ContactsContract API changes