Back out changeset 12cdc8931e48 (Bug 857730) to remove Android Contacts permission.