Merge "Revert "Calendar: Drop no longer existing activity from manifest"" am: 623f47500c am: 0ecb18d32e
am: 36bf474b59

Change-Id: Ifdd77a0964961e34fdbeb7037a6fc826d1686940