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

[automerger skipped] Merge "[RESTRICT AUTOMERGE][SettingsProvider] key size limit for mutating settings" into sc-qpr1-dev am: 254f5251 -s ours am: 0bcb9506 -s ours am: 539884bb -s ours am: bca69e85 -s ours am: 9361d720 -s ours am: cccefd70 -s ours

am skip reason: subject contains skip directive

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



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