Merge "Revert^2 "AOSP/Calendar: bump target API level."" into main am: 3c446d94e2

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

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