[automerger skipped] Merge changes from topic "settingsprovider_keylimit-sc-dev" into sc-qpr1-dev am: ff672cd789 -s ours am: fbde17b949 -s ours am: 9b8d766775 -s ours

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

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

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