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

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

Change-Id: I17de63457259f7791916e4a1ff5575124784ae4a