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

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

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