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

Merge "Reduce gratuitous resets for OneShotTimer" into tm-dev am: 7235ddab am: eb96c76b am: 06c2d41d

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



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