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

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



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