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

Change-Id: If8de0b96e928834445ca924a43ca374e9cc59e88