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

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

Change-Id: I44485af3218d14808c5bdee2269ad1cc503bd5e1