[automerger skipped] Merge "[RESTRICT AUTOMERGE][SettingsProvider] key size limit for mutating settings" into rvc-dev am: da1180f4f8 -s ours am: 75aea6896a -s ours am: 57ac1cc9dd -s ours am: e0fb5fbdc2 -s ours am: 880d68994a -s ours am: 5c3e15f2d0 -s ours am: 09628db539 -s ours am: 54845c3344 -s ours am: 73a48bd863 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20250971 Change-Id: Id15c84f36576454563e40a50a92fbb0c0875f5ed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: