Add CUSTOM_NOTIFICATION to ContactsContract
- to allow custom notification sounds to be assigned to individual contacts.

Change-Id: Iba40e5237200385a467ac9cdb441b1ed7de3a1da

Conflicts:

	core/java/android/provider/ContactsContract.java