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

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

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