[automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into rvc-dev am: 43c97113 -s ours

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

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



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