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

[automerger skipped] Merge "[RESTRICT AUTOMERGE][SettingsProvider] key size limit for mutating settings" into tm-dev am: 24172b27 -s ours am: 15473833 -s ours

am skip reason: Merged-In Ic9e88c0cc3d7206c64ba5b5c7d15b50d1ffc9adc with SHA-1 75c1d609 is already in history

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



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