[automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into tm-dev am: 7293df1ee9 am: 01bccaa3dc am: a92710727b am: f722ccf000 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20226664 Change-Id: If88115de77de897e2bf7a3c82c00a532a2f3a3fa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: