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

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

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