Merge "AOSP/Calendar - .java files deleted" am: b75e6bd5a4 am: df1e123b8a

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

Change-Id: I141fb5b8f09af2419c621d9b2587fb946a082069