Merge "Fix Kotlin safety build error" into main am: aaac2b7a94

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

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