Merge "Fix flaky recurrent timer test." into main am: d0cb2e73 am:...

Merge "Fix flaky recurrent timer test." into main am: d0cb2e73 am: 83e99ff3 am: b3f840a6 am: d8ab6380 am: e993d4b8

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



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