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

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

Change-Id: I62c67b760ff5caf8f42ec07084a7fd0cd82c558f