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

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



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