[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "settingsprovider_keylimit-sc-dev" into sc-qpr1-dev am: ff672cd7 -s ours am: fbde17b9 -s ours

am skip reason: Merged-In Ic9e88c0cc3d7206c64ba5b5c7d15b50d1ffc9adc with SHA-1 75c1d609 is already in history

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



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