[automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into sc-qpr1-dev am: b66bf1e630 -s ours am: dcdb78835a -s ours am: ee89262670 -s ours am: 4132815cb0 -s ours am: 5ba7124e01 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20226663 Change-Id: I7bf6f6c22e17ff65b706d8e218fb2dda3d00fe51 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: