[automerger skipped] Merge "Revert^4 "CalendarTests minsdk  bump from 19 to 21"" into main am: 3d28a5b371 -s ours

am skip reason: Merged-In Ia2f80a011daaf4921032538dea98627c83d30843 with SHA-1 00ad9ed676 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/3146300

Change-Id: Ia9fe9d570554f28029b36b093ab5a1452894f033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>