[automerger skipped] [RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated am: 966b597383 -s ours

am skip reason: Merged-In I20551a2dba9aa79efa0c064824f349f551c2c2e4 with SHA-1 a8f756f989 is already in history

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

Change-Id: I5f8a45ce0234c31e432dec567777ec7c7056dd10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>