Fix bug #3185258 Events (single / recurring) are not deleted immediately - DO NOT MERGE

- make instance expansion not expand recurring events that haev been deleted by the user
- merge code from master (change https://android-git.corp.google.com/g/#change,50285)
- merge code from master (change https://android-git.corp.google.com/g/#change,54585)

Change-Id: I957a2bcac0e7f3d39fe1c50390715bdf5d8e7705
1 file changed