Make sure we only upload exceptions for the correct event

* We weren't checking calendar id along with original event id when
  uploading (original event id isn't unique)
* Fix the query selection to ensure finding the correct exception(s)

Bug: 2545659
Change-Id: I276dd10e2be171bd9d4f3300cdc8843bb28f2781
1 file changed