[automerger skipped] Merge "Revert^3 "CalendarTests minsdk bump from 19 to 21"" into main am: 0102783f12 -s ours am skip reason: Merged-In Ia2f80a011daaf4921032538dea98627c83d30843 with SHA-1 00ad9ed676 is already in history. Merged-In was found from reverted change. Reverted change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/3140379 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/3146838 Change-Id: I3a21613a1b90d812094d2a7e38c8ebaae434d11b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>