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: 9e7cbcbc

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



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