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: 0ca9e31d am: c5c5bd8d

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



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