[automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into rvc-qpr-dev am: fec4943a -s ours am: 6c3388db -s ours am: 898ea306 -s ours am: c3e202e5 -s ours

am skip reason: subject contains skip directive

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



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