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

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

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