[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-dev am: 01effff4 -s ours am: fdb48f4e -s ours am: 3e23e539 -s ours am: 2564f563 -s ours am: 0dd797b4 -s ours am: e2e8fc08 -s ours

am skip reason: subject contains skip directive

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



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