Merge "Add timeout logic to TestWakeupClientServiceImpl." am: bcd5438325

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

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