Merge "Use public API of Settings.Secure to get/put secure settings" am: d7203652f7

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

Change-Id: Ic681954e4daf5242ef5cc5f02fb48f080e57d533