[automerger skipped] Merge "[RESTRICT AUTOMERGE][SettingsProvider] key size limit for mutating settings" into rvc-qpr-dev am: d833522d43 -s ours am: 82e053bf2a -s ours am: f4ced1f935 -s ours am: 0d6a58c9c8 -s ours am: bcf1f63141 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20248332 Change-Id: I5247339a6f1e5cef768fe5f21919bdc6047b7009 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: