Merge "Fix SuspendPackageHelperTest after Kotlin 1.7.20" am: bababa91d6

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

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