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

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

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