Merge "Remove log with sensitive info in CalendarProvider2."