Merge "Reduce gratuitous resets for OneShotTimer" into tm-dev am: 7235ddab...

Merge "Reduce gratuitous resets for OneShotTimer" into tm-dev am: 7235ddab am: 8960d323 am: 689dff4a am: b69243d8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18303760



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