[automerger skipped] Fix runtime kotlin nullable error in...

[automerger skipped] Fix runtime kotlin nullable error in ScreenshotDetectionControllerTest am: b6aaf842 am: 4e9b309e am: 3ba8ce49 -s ours

am skip reason: Merged-In I4b68fdbc779ec8c0bcbd4e9efbdffbd5edcdf427 with SHA-1 e6fb02ce is already in history

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



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