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

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

Change-Id: Ib5b26b274df16e30b1f47701a2121670d6752fa8