Merge "Revert "Calendar: Drop no longer existing activity from manifest""
am: 623f47500c

Change-Id: I0144e8e312587d1e7263635544359d3616e2f89f