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

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

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

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