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

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

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