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

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

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