[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-qpr1-dev am: b66bf1e6 -s ours am: dcdb7883 -s ours am: ee892626 -s ours am: 4132815c -s ours am: 5ba7124e -s ours am: df35cc7e -s ours

am skip reason: subject contains skip directive

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



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