Merge "Fix for warning: unnecessary non-null assertion (!!) on a non-null receiver" am: 184f6f34cb am: d0492ffe01 am: f591695824 am: 2529d159e5

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

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