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

[automerger skipped] Merge "[RESTRICT AUTOMERGE][SettingsProvider] key size limit for mutating settings" into rvc-qpr-dev am: d833522d -s ours am: 82e053bf -s ours am: f4ced1f9 -s ours am: 0d6a58c9 -s ours am: bcf1f631 -s ours am: 07b287b2 -s ours am: 9021f451 -s ours am: 566f33b8 -s ours

am skip reason: subject contains skip directive

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



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