[automerger skipped] Merge "Fix SuspendPackageHelperTest after Kotlin 1.7.20" am: bababa91d6 am: 838c21a603 am: 52879c095d -s ours

am skip reason: Merged-In Ie900be9e8f8a306f06e9856a25965c7a9e08b684 with SHA-1 5f693a3721 is already in history

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

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