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

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



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