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

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

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