Merge "Calendar: Drop no longer existing activity from manifest"
am: 439a6d3931

Change-Id: I4307f5c8f659fefb4bca5bb1e1e4b9cd8f1c4e11