Merge "Tweak wakeup time for OneShotTimer to reduce jank" into tm-dev am:...

Merge "Tweak wakeup time for OneShotTimer to reduce jank" into tm-dev am: 57a40d9d am: d78b0abd am: 7dd4b53f am: 411a2bae

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



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