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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into sc-v2-dev am: 443d29b7 -s ours am: 5d30049f -s ours am: e3560bbd -s ours am: d0078589 -s ours am: e7c9c7dc -s ours

am skip reason: subject contains skip directive

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



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