[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 skip reason: subject contains skip directive

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



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