Merge "Calendar: Drop no longer existing activity from manifest" am: 439a6d3931 am: 9b9e59c008
am: 0ac9150d43

Change-Id: Ie07827f654d14e8723529107d0e2e2fed3224681