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

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

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