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

[automerger skipped] Merge "[RESTRICT AUTOMERGE][SettingsProvider] key size limit for mutating settings" into qt-dev am: 14a5113c am: f36b8278 -s ours am: 4bdc2cd1 -s ours am: 857d4f2a -s ours am: 434c64ff -s ours am: eee2531e -s ours am: c16c4bb8 -s ours am: 2be2258f -s ours am: e39d6113 -s ours am: eaf8ac53 -s ours

am skip reason: subject contains skip directive

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



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