[automerger skipped] [SettingsProvider] mem limit should be checked before...

[automerger skipped] [SettingsProvider] mem limit should be checked before settings are updated am: d85a4282 am: 8451db57 -s ours am: 8a46d49b -s ours am: cf56315d -s ours am: 08a80ad4 -s ours am: efbc8f2b -s ours

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

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



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