Merge "Fix: warning: unnecessary safe call on a non-null receiver of type ___. This expression will have nullable type in future releases" am: ba9c44550f

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

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