[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-dev am: 7293df1e am: acdae48f -s ours

am skip reason: subject contains skip directive

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



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