[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: 0955d92a -s ours am: 9316713b -s ours

am skip reason: subject contains skip directive

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



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