Merge "Revert^2 "CalendarTests minsdk  bump from 19 to 21"" into main