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

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

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