Merge "[SettingsProvider] update API javadoc" am: ebcfe1c6e0 am: 9338b2de56

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

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