Also, a couple of changes for ContactsContract itself. Change-Id: Ie16024c8bfeac97cfadcc69fa82b46828ef3953d