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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into tm-qpr-dev am: 84e6a0f3 -s ours

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

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



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