Merge "Expose APIs for Settings" am: cf599f82fc am: a708a0cfe6

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

Change-Id: I4a65fa2e637a01f13ac14d8413a7be47a37c7937