b/2633629 Makes deleting an exception set it to canceled

Instead of deleting exceptions we just want to mark them as canceled
so the UI will hide them. Incremental instance expansion for changes
in the eventStatus are still needed to make this a smooth operation.

Change-Id: Id00656e4613ab384f094d4f2b4a75a9d0979c59f
Merge commit '83f7ce18540aa5b8ed2402d178d35520cd725dea' into oxygen_4.3

* commit '83f7ce18540aa5b8ed2402d178d35520cd725dea':
  b/2633629 Makes deleting an exception set it to canceled

Conflicts:
	src/com/android/calendar/DeleteEventHelper.java