Merge "Increase max allowed min update jitter to 30s" into sc-dev am:...

Merge "Increase max allowed min update jitter to 30s" into sc-dev am: 224f7152 am: 289be664 am: 955c9276

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

Change-Id: Ia49190df8d239d1d2dd778323fe65c3f11c4e546