[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: c4840998 -s ours

am skip reason: subject contains skip directive

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



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