[automerger skipped] [SettingsProvider] mem limit should be checked before settings are updated am: d85a428210 am: 8451db5766 -s ours

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

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

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