Merge "Initial fixes for SuspendPackageTest for headless system user mode:" into sc-dev am: 9dbed0abf4

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/13830229

Change-Id: Iaa4169b96f8832d0561a657b3559770dab991025