Merge "Fix rescheduling of jobs with large periods." into tm-dev am:...

Merge "Fix rescheduling of jobs with large periods." into tm-dev am: e4910105 am: c9371d5e am: ed5d66a6

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



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