am 259540ad: am 85abdc59: Make the new ContactsContract public.

Merge commit '259540ad8d6219fb09d2c55b0486139028dc68d0'

* commit '259540ad8d6219fb09d2c55b0486139028dc68d0':
  Make the new ContactsContract public.