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

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

Change-Id: I007c12c13166e38181b5d45b9c106b8c1d832c91