[automerger skipped] Merge "[SettingsProvider] update API javadoc" am:...

[automerger skipped] Merge "[SettingsProvider] update API javadoc" am: ebcfe1c6 am: 9338b2de am: 8f9b80e5 -s ours am: 6c319e05 -s ours am: 9d7ddd10 -s ours am: 28cc37d7 -s ours

am skip reason: Merged-In I3042be0671728d06bf1c7ae09baee538bb82fbe7 with SHA-1 c848cb71 is already in history

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



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