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

[automerger skipped] Merge "[RESTRICT AUTOMERGE][SettingsProvider] key size limit for mutating settings" into rvc-dev am: da1180f4 -s ours am: 75aea689 -s ours am: 57ac1cc9 -s ours am: e0fb5fbd -s ours am: 880d6899 -s ours am: 5c3e15f2 -s ours

am skip reason: subject contains skip directive

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



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