[automerger skipped] Merge "Fix flaky recurrent timer test." into main am:...

[automerger skipped] Merge "Fix flaky recurrent timer test." into main am: d0cb2e73 am: 83e99ff3 am: b3f840a6 am: d8ab6380 am: e993d4b8 am: 9eb7b82d -s ours

am skip reason: Merged-In Iff271ca440426871ed3a798bab50b9532f9256f0 with SHA-1 76d7fbf6 is already in history

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



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