BootReceiver: Skip subdirectories inside tombstones scan

Properly handle (vendor-specific) subdirs under tombstones
directory by skipping over them.

CRs-Fixed: 407529
Change-Id: I0cecd9fa629fad35d62d508ddaf13968c2e46f93
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