[automerger skipped] Fix kotlin nullable errors in TrustTests am: 5f70c1728f am: a9119a324c -s ours am: 92c757766c -s ours

am skip reason: Merged-In I31c4f4d256ff8dd2b6ed1f6ed74844ccaf7a4814 with SHA-1 c5a0cfdd91 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2744073

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