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

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

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