[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: 499f3902 -s ours

am skip reason: subject contains skip directive

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



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