Merge "Increase max allowed min update jitter to 30s" into sc-dev am: 224f7152 am: 47d020ae

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

Change-Id: Ifbd5df7386c34402eefc49f4566ee1f6f51f9e73