Merge "suspend: De-flake suspend tests" am: 1e625c74be

Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/2208073

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