Merge "CalendarProvider: Remove unused string resource" am: 88dbaae618
am: 49003cfd28

Change-Id: I80bb65b61b87579de6eba27872bdb1d5206d1780