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

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

Change-Id: I2c4eb063741c99db94075e11ec9574316efc4537