[automerger skipped] Merge "[RESTRICT AUTOMERGE][SettingsProvider] key size...

[automerger skipped] Merge "[RESTRICT AUTOMERGE][SettingsProvider] key size limit for mutating settings" into sc-dev am: 3e52a3f7 -s ours am: 0ace1827 -s ours am: ce7ea212 -s ours am: 2703de1d -s ours

am skip reason: subject contains skip directive

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



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