Merge "Fix flaky recurrent timer test." into main am: d0cb2e73b2 am: 83e99ff3b1

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

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